From fe2865259f1c05f0bbae12a2d4e46060b7ddbe35 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 28 May 2019 00:04:15 +0000 Subject: [PATCH] color chooser dialog: Make final --- gtk/gtkcolorchooserdialog.c | 15 +++++++++++++++ gtk/gtkcolorchooserdialog.h | 24 ------------------------ 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/gtk/gtkcolorchooserdialog.c b/gtk/gtkcolorchooserdialog.c index 73c6aad57b..c492e8fc62 100644 --- a/gtk/gtkcolorchooserdialog.c +++ b/gtk/gtkcolorchooserdialog.c @@ -39,6 +39,21 @@ * a color. It implements the #GtkColorChooser interface. */ +typedef struct _GtkColorChooserDialogPrivate GtkColorChooserDialogPrivate; +typedef struct _GtkColorChooserDialogClass GtkColorChooserDialogClass; + +struct _GtkColorChooserDialog +{ + GtkDialog parent_instance; + + GtkColorChooserDialogPrivate *priv; +}; + +struct _GtkColorChooserDialogClass +{ + GtkDialogClass parent_class; +}; + struct _GtkColorChooserDialogPrivate { GtkWidget *chooser; diff --git a/gtk/gtkcolorchooserdialog.h b/gtk/gtkcolorchooserdialog.h index 7b86d15f60..b4a16d083b 100644 --- a/gtk/gtkcolorchooserdialog.h +++ b/gtk/gtkcolorchooserdialog.h @@ -28,33 +28,9 @@ G_BEGIN_DECLS #define GTK_TYPE_COLOR_CHOOSER_DIALOG (gtk_color_chooser_dialog_get_type ()) #define GTK_COLOR_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_CHOOSER_DIALOG, GtkColorChooserDialog)) -#define GTK_COLOR_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_CHOOSER_DIALOG, GtkColorChooserDialogClass)) #define GTK_IS_COLOR_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_CHOOSER_DIALOG)) -#define GTK_IS_COLOR_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_CHOOSER_DIALOG)) -#define GTK_COLOR_CHOOSER_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_CHOOSER_DIALOG, GtkColorChooserDialogClass)) typedef struct _GtkColorChooserDialog GtkColorChooserDialog; -typedef struct _GtkColorChooserDialogPrivate GtkColorChooserDialogPrivate; -typedef struct _GtkColorChooserDialogClass GtkColorChooserDialogClass; - -struct _GtkColorChooserDialog -{ - GtkDialog parent_instance; - - /*< private >*/ - GtkColorChooserDialogPrivate *priv; -}; - -struct _GtkColorChooserDialogClass -{ - GtkDialogClass parent_class; - - /* Padding for future expansion */ - void (*_gtk_reserved1) (void); - void (*_gtk_reserved2) (void); - void (*_gtk_reserved3) (void); - void (*_gtk_reserved4) (void); -}; GDK_AVAILABLE_IN_ALL GType gtk_color_chooser_dialog_get_type (void) G_GNUC_CONST; -- 2.30.2